bitkeeper revision 1.1159.187.53 (41af4581GTHH1sJIbO5TqzuAB2ifOg)

Fix 2.4 build. Minor mods to the balloon driver.

diff --git a/linux-2.4.28-xen-sparse/arch/xen/drivers/balloon/Makefile b/linux-2.4.28-xen-sparse/arch/xen/drivers/balloon/Makefile
index 9fb22279788d8a22dd987b11479738184d87b7da..c97a95a5227ea507bf5d0de63c51662628b6c4ff 100644 (file)
--- a/linux-2.4.28-xen-sparse/arch/xen/drivers/balloon/Makefile
+++ b/linux-2.4.28-xen-sparse/arch/xen/drivers/balloon/Makefile
@@ -1,3 +1,4 @@
 O_TARGET := drv.o
+export-objs := balloon.o
 obj-y := balloon.o
 include $(TOPDIR)/Rules.make

diff --git a/linux-2.6.9-xen-sparse/drivers/xen/balloon/balloon.c b/linux-2.6.9-xen-sparse/drivers/xen/balloon/balloon.c
index 772d52b1ec6dd7b34cea442b643d052f716c0328..f90d8728fdeafd0142a5a9a10c9688cdea158626 100644 (file)
--- a/linux-2.6.9-xen-sparse/drivers/xen/balloon/balloon.c
+++ b/linux-2.6.9-xen-sparse/drivers/xen/balloon/balloon.c
@@ -50,8 +50,6 @@
 #include <asm/tlb.h>
 #include <linux/list.h>
 
-#define MIN_TARGET ((16 << 20) >> PAGE_SHIFT) /* 16MB */
-
 static struct proc_dir_entry *balloon_pde;
 
 static DECLARE_MUTEX(balloon_mutex);
@@ -93,6 +91,7 @@ static struct timer_list balloon_timer;
 #define LIST_TO_PAGE(l) ( list_entry(l, struct page, list) )
 #define UNLIST_PAGE(p)  ( list_del(&p->list) )
 #define pte_offset_kernel pte_offset
+#define subsys_initcall(_fn) __initcall(fn)
 #endif
 
 #define IPRINTK(fmt, args...) \
@@ -159,8 +158,6 @@ static unsigned long current_target(void)
     unsigned long target = min(target_pages, hard_limit);
     if ( target > (current_pages + balloon_low + balloon_high) )
         target = current_pages + balloon_low + balloon_high;
-    if ( target < MIN_TARGET )
-        target = MIN_TARGET;
     return target;
 }
 
@@ -443,7 +440,7 @@ static int __init balloon_init(void)
     return 0;
 }
 
-__initcall(balloon_init);
+subsys_initcall(balloon_init);
 
 void balloon_update_driver_allowance(long delta)
 {